merge emacs-24
authorKenichi Handa <handa@gnu.org>
Sat, 15 Dec 2012 11:37:25 +0000 (20:37 +0900)
committerKenichi Handa <handa@gnu.org>
Sat, 15 Dec 2012 11:37:25 +0000 (20:37 +0900)

Trivial merge